Merge remote-tracking branch 'origin/master' into feature/pgtk

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/termhooks.h
index 649a4236d208402cff001c57a2814183c2257d20,f64c19e0397eea4051b373388d9c17045d5b96c7..b124e995292f6453cdbbfcf38bece558017024c2
--- 1/src/termhooks.h
--- 2/src/termhooks.h
+++ b/src/termhooks.h
@@@ -269,10 -268,12 +269,17 @@@ enum event_kin
    , FILE_NOTIFY_EVENT
  #endif
  
 +#ifdef HAVE_PGTK
 +  /* Pre-edit text was changed. */
 +  , PGTK_PREEDIT_TEXT_EVENT
 +#endif
++
+   /* Either the mouse wheel has been released without it being
+      clicked, or the user has lifted his finger from a touchpad.
+ 
+      In the future, this may take into account other multi-touch
+      events generated from touchscreens and such.  */
+   , TOUCH_END_EVENT
  };
  
  /* Bit width of an enum event_kind tag at the start of structs and unions.  */